From 5d8863bbac7ee59fc137744c2365cc132878d9cc Mon Sep 17 00:00:00 2001 From: Jonathan Blandford Date: Wed, 10 Mar 2004 05:24:23 +0000 Subject: [PATCH] use uri instead of the pathname for UTF-8 safety. Wed Mar 10 00:24:24 2004 Jonathan Blandford * gtk/gtkfilechooserdefault.c (error_dialog): use uri instead of the pathname for UTF-8 safety. --- ChangeLog | 5 +++++ ChangeLog.pre-2-10 | 5 +++++ ChangeLog.pre-2-4 | 5 +++++ ChangeLog.pre-2-6 | 5 +++++ ChangeLog.pre-2-8 | 5 +++++ gtk/gtkfilechooserdefault.c | 7 +++++-- 6 files changed, 30 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index a2809e1745..380ffce681 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +Wed Mar 10 00:24:24 2004 Jonathan Blandford + + * gtk/gtkfilechooserdefault.c (error_dialog): use uri instead of + the pathname for UTF-8 safety. + Wed Mar 10 00:10:47 2004 Jonathan Blandford * gtk/gtkfilechooserdefault.c (shortcuts_insert_path): Always diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index a2809e1745..380ffce681 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,8 @@ +Wed Mar 10 00:24:24 2004 Jonathan Blandford + + * gtk/gtkfilechooserdefault.c (error_dialog): use uri instead of + the pathname for UTF-8 safety. + Wed Mar 10 00:10:47 2004 Jonathan Blandford * gtk/gtkfilechooserdefault.c (shortcuts_insert_path): Always diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4 index a2809e1745..380ffce681 100644 --- a/ChangeLog.pre-2-4 +++ b/ChangeLog.pre-2-4 @@ -1,3 +1,8 @@ +Wed Mar 10 00:24:24 2004 Jonathan Blandford + + * gtk/gtkfilechooserdefault.c (error_dialog): use uri instead of + the pathname for UTF-8 safety. + Wed Mar 10 00:10:47 2004 Jonathan Blandford * gtk/gtkfilechooserdefault.c (shortcuts_insert_path): Always diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6 index a2809e1745..380ffce681 100644 --- a/ChangeLog.pre-2-6 +++ b/ChangeLog.pre-2-6 @@ -1,3 +1,8 @@ +Wed Mar 10 00:24:24 2004 Jonathan Blandford + + * gtk/gtkfilechooserdefault.c (error_dialog): use uri instead of + the pathname for UTF-8 safety. + Wed Mar 10 00:10:47 2004 Jonathan Blandford * gtk/gtkfilechooserdefault.c (shortcuts_insert_path): Always diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index a2809e1745..380ffce681 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,3 +1,8 @@ +Wed Mar 10 00:24:24 2004 Jonathan Blandford + + * gtk/gtkfilechooserdefault.c (error_dialog): use uri instead of + the pathname for UTF-8 safety. + Wed Mar 10 00:10:47 2004 Jonathan Blandford * gtk/gtkfilechooserdefault.c (shortcuts_insert_path): Always diff --git a/gtk/gtkfilechooserdefault.c b/gtk/gtkfilechooserdefault.c index 16b7fe61ec..ab6645f718 100644 --- a/gtk/gtkfilechooserdefault.c +++ b/gtk/gtkfilechooserdefault.c @@ -606,13 +606,16 @@ error_dialog (GtkFileChooserDefault *impl, const GtkFilePath *path, GError *error) { + char *uri; char *text; + uri = gtk_file_system_path_to_uri (impl->file_system, path); text = g_strdup_printf (msg, - gtk_file_path_get_string (path), - error->message); + uri, + error->message); error_message (impl, text); g_free (text); + g_free (uri); g_error_free (error); } -- 2.30.2